resolving merge conflicts in visual studio code